Remove the show-unicode-menu and show-input-method-menu settings

These are no longer used.

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index b3c30542ae613226061f624ae48900ee71c9db63..d13672cb917e4da48517fd3f9f996e4cb8ab1f36 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -160,8 +160,6 @@ enum {
   PROP_CURSOR_THEME_SIZE,
   PROP_ALTERNATIVE_BUTTON_ORDER,
   PROP_ALTERNATIVE_SORT_ARROWS,
-  PROP_SHOW_INPUT_METHOD_MENU,
-  PROP_SHOW_UNICODE_MENU,
   PROP_TIMEOUT_INITIAL,
   PROP_TIMEOUT_REPEAT,
   PROP_TIMEOUT_EXPAND,
@@ -612,24 +610,6 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                              NULL);
   g_assert (result == PROP_ALTERNATIVE_SORT_ARROWS);
 
-  result = settings_install_property_parser (class,
-                                             g_param_spec_boolean ("gtk-show-input-method-menu",
-                                                                   P_("Show the 'Input Methods' menu"),
-                                                                   P_("Whether the context menus of entries and text views should offer to change the input method"),
-                                                                   TRUE,
-                                                                   GTK_PARAM_READWRITE),
-                                             NULL);
-  g_assert (result == PROP_SHOW_INPUT_METHOD_MENU);
-
-  result = settings_install_property_parser (class,
-                                             g_param_spec_boolean ("gtk-show-unicode-menu",
-                                                                   P_("Show the 'Insert Unicode Control Character' menu"),
-                                                                   P_("Whether the context menus of entries and text views should offer to insert control characters"),
-                                                                   TRUE,
-                                                                   GTK_PARAM_READWRITE),
-                                             NULL);
-  g_assert (result == PROP_SHOW_UNICODE_MENU);
-
   result = settings_install_property_parser (class,
                                              g_param_spec_int ("gtk-timeout-initial",
                                                                P_("Start timeout"),
@@ -988,7 +968,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
    * This also can be a colon-separated list of input methods, which GTK+
    * will try in turn until it finds one available on the system.
    *
-   * See #GtkIMContext and see the #GtkSettings:gtk-show-input-method-menu property.
+   * See #GtkIMContext.
    */
   result = settings_install_property_parser (class,
                                              g_param_spec_string ("gtk-im-module",